This is a bugfix #2873