Error 500 #58

Fixed