final commit issue #311 fixed