fixed based on code inspection -> method too complex