Fixes issue introduced with performance optimization