Fix #70 issue