a working and tested fix for the extras bug.