EOF fix (2)
Migrated SecurityListener #8