BUGFIX: Order of class declarations