fixes #2057 and first spike of #2061