More handling for unstandard layouts