Another fix to two computers mode