Fixed handling of ToG data