fixes #3599 again