Issue #9 (Eier Bug) fixed