Feature/fix issue 137