Fixes #1083, if that is even worthwhile.