Feature/fix issue 87