Bugfixed

Bugfixing after first test