rename expand here as well
fix #74