This is a bugfix #2872