Ammended issues with patch