Final fix for gradient bugginess