sort of a merge fix...