some bugfixing in issues