fixed on drop issue