server: blocking bug fix