Bug fix to auto hardware mode