Trying to fix final callback