Issue #37 - reset the attribute functions correctly