Modification of the generation command handler to resolve problem due to
migration to kepler