issue #2 fix final@