fix strange issues