Apply hotfix. View will resolve correctly
fix logic issues