Fixes #3 - Fixes issue in front-end after the previous commit