#1340 update