Issue #5: Missing Long-Fix