Fixing #26
Fixing #27