Revision 24 (Hotfix)

Errors hotfix 1