Fixing bug #2 and #3