Fix for front end labels

@lrgeofflewis one for you