fixing serving