Fixed #151, Fixed #154