done issue #45, #46