Another merge fix..