#46 first version. #44 resolved