Fixes issue #387 for express3 branch