Fixes issue #1538 ... for real this time