Fixing bug2

Fixes #2