Fixing #3
Fixing #4