Bugfix 25.5 -> 24.5 and refactoring