actually this changes really fixes #9