2.1.5 - Fix Schemes