m_zhelyaskov homevork #12 (fixed field names)