Issue: #240 - Fixing problem view