Added missing true return at the end