fixed 50000 errors