Fixes #1740 - not tested on hardware