Performance optimization as per #145