#372, #380 fixed
#57 fixed