Fixed hacky callback