fixed minor performance degradation