Fixing bug pointed out by Mark