Issue #10: Hotfix for failing tests