Bugfix #1: non-declared class FL removed