Fixed Tam's fixes no. 2