fixed issue 1159