Fixed #145