Fix for SimpletonServer