Now it REALLY fixes #2 ;)