Implements bug #147 comments in note-29