FIxing eventful API