Fixed fragments bugs part 2