Removed 5.4 issue with type casting inside empty