Changed if in BlockHandler