Merging bugfix for 744