@jvazquez-r7 added 'return false' here