Fixing double callback