Fixing #14
Fixing #14