Fixes issue 629.