fixed #453 on non-dedicated server