Even more bugfix (2.1.12.281)