Fixed #51, Fixed #48