Applying fix only for Workspace Layout