[#1444] bug fix