Small bug-fix.
Merge branch 'feature/widget_entry_implementation' into 'develop'