First try ti fix issue #44