Fixed #14 [Part Two]