Bugfix internal server error