Lukas, if needed, feel free to port this back to 1.0.1 as well - but only if really needed