StatusFactory fix