FIX: Text-Bugs