Slight bugfixing