Started fixing bug #1