Handle drops better