fixing 840