Fixed #91, Fixed #92