Better drag handling