Fixes issue caused by fix for issue 629