Fix double call-back issue