more bugfixing, this is becoming a trend...