Feature/fix issue 145