Make work with 95x