Quick fix for botching the callback