Fix for too many errors