better fix of this issue
1 file changed