Removed incorrect struct handling.