Minor logical improvement and backwards compatibility