Issue #125 Internal Server Error