Fixing Draegert stuff