fixed & close issue #56