First patch and most glaring issue not resolved...