Fix problem with drag and drop