* Fixed #2