feature #364