Use makeAs in calendar too