Close #445 - error when clients use forge