It fixes #15 issue, small modification