fixes #1649
fixed tests