Improve the drop logic a little bit