Bug fixin: part 2