Fix #156 issue