Adding bugfix for 1052044