[Issue 1] Fixed w/ Yongwen's help.