Small optimization and option to be strict