fixes #1003, part 2