Fixes issue 429