#1488 some changes