I tried the original and to be fair it was untested at the time. So I made this as the rest of the parts were great! This did the trick and worked as my son said "flawlessly". I think he was a bit happy it was working.
Print Square end up and add support under the square part on top of the round ledge.
Please let me know if it works for you.