@jvazquez-r7 added a 'return nil' here