Fix to task24