Fixed #95