fix issue 44
fix issues 44 en 45