With more tabulation checking