Fixed #1

Fixed notify signal being generated incorrectly and also made sure
notify signal was actually being emitted when necessary.