Front End Bug Fix