Fixes Fatal Errors on pre 5.5