[#85] more fixes