Merge fix (hopefully)