fixed simple server error
merged