Drop algorithm debugged and fixed