Make work with EB