#424 workspace patch