Correct for bugfix #0000232