fixes #5527