Further Bugfixing

Further Bugfixing