Workspace fix

Fixes #327.