Drag fix that should complete and close #4