only fixed issue #6 now