Fixing #10

Fixing #10