Small performance patch

An issue was reported few days ago about performance issues in specific conditions. This patch fixes this