Fixed #94