more details for #42 & #44