Fixed for 1.8.1 efls