Changing serve method as per tip from @matejkramny