bugfixing ... gn8