Fix to work with ABC structure