Event happens after prop changed. Issue #540