FS-3739 please try this patch, its not so much of a bug as an unintended consequence of combining features but this may be the best of both worlds