Try to fix cap bugs from nitrous2