Changed status fix to use id comparison instead of object comparison.