Fixed #132