Another fastfix