* Fixed #48