resolve issue #4 #1