Drop bugs fixed