Wow even more bugfix (2.1.12.310)