Corrected a bug caused by being a rookie at branch merging.