Second solution to fixe Issue #52

Second solution to fixe issue 52