multiple bug solved in drop