Fixture Bug Workaround; cleanup