Fixed callback loop