Fixed double callback