fixes issue #2482 but without the crud