Modified issue fix for new structure.