fixes #2464