Fixed Bug part 2