Callbacks flow fix (very bad, Roma, very bad)