Fixes for getting Correctly Drop Traget