Fixed #162