Fix block parser