#4137 Fix views