Fixed#3 commit