jobs creation bug cleanup