Fixed #7. This was caused when the responsible method was extracted (refactored)