SangerUniversal refactoring bugfix