Fixes front end bugger