Front end hot fix