Hopefully fixing bug #3