drops and storage fix
fixed #2