Fixing unit access bug