more 5.4+ compatibility