Cleanest Primitive Fix