use BlockMen's fixes