#1494 update