fixes issue 429