Tidy up patch
1.2.1