More optimisation for #516

Signed-off-by: Ross Allan <rallanpcl@gmail.com>