Bug fix for client blocking