Added a small fix to ease the CPU strain.