hopeful merge fix