Minor optimisation for my camera fix for issue #207