Fixing before/after-block comparison