fixed issue found by wande