#275 - rejig fix to only perform required processing