Bug in drop() fixed