[WIP] fix Bug 997934 - Makes view