Complete fixed issue #36