Fix for sliding bugs