Fix for better performance