Fix issue #18 #3