[#209] add unit when possible