fixes #5537