Fixes SYNR-728 (no tests, Chris doing...)