done issue #8 (types change)