Add back $apply with more check