Fix #254 issue