Continued bugfixing on last issue.