moar compatibility for 5.4