merging mspiegel's prefix fix