Fixed issues with using more powerful base view