fixes to 12