Bug fix: stuff