Application - Calcualtor: Bugfix from report