This fixes #10 issue