Fixing jenkins' concerns