fixed issue with drag/drop