Attempt to fix the drop action. This needs more testing.