Fix #115 issue