Fixed #71