Fixed #79