Fixed a bug with short_own and went back to the notify behavior from
0.4