Feature/fix issue 204