FrontEnd: Fixing Issue #0000151