tutorial bugfixing