Front-end bug fix 3-4