Front end hot fix #2