#221: fixed an issue
Close #221