fixes on drop