Adding fix for quicksand