Fixes issue #481.