better fix (issue: #285)