Fixed problems with onCallback