#94 minor performance enhancement