Fix for performance