Bugfix Work and plan view
Bugfix Work and plan view