Fixed callbacks, hopefully.