Fixing bug #3

Fixing bug #3