Front end fix