Fixes #1508 - Needs another non regression test