#1249 update