Not sure if really fixes #2