Improve static keeping of the views
Fix bug
*le sigh*
Fixes #4014