better fix for issue