bug-Fix + armor class

Signed-off-by: Ullrich Buschmann <ullrich.buschmann@hhu.de>