Fixes part19