Added past fixing reference + Bug fixing