Fixed Fragment bugs part 3