Fix errors 10 & 11 / Revision 2.2.1