fixes #6160