Merge in freddies fix